Merge branch 'master' into treeview-refactor
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Tue, 16 Nov 2010 07:21:04 +0000 (16:21 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Tue, 16 Nov 2010 07:21:04 +0000 (16:21 +0900)

Trivial merge